data: Use org.gnome.Shell prefix for systemd units

In general we want to move towards using reverse domain names for
systemd units. Doing this also means we have a consistent name between
desktop file and systemd unit, allowing us to create a generator that
pulls in the unit as defined in the sessions RequiredComponents.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/895

diff --git a/data/gnome-shell-disable-extensions.service b/data/gnome-shell-disable-extensions.service
deleted file mode 100644 (file)
index de91167..0000000
--- a/data/gnome-shell-disable-extensions.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=Disable GNOME Shell extensions after failure
-# Note that this unit must not conflict with anything, and must
-# be able to run in parallel with the gnome-session-shutdown.target.
-DefaultDependencies=no
-
-# We want to disable extensions only if gnome-shell has flagged the extensions
-# to be a likely cause of trouble.
-ConditionPathExists=%t/gnome-shell-disable-extensions
-
-[Service]
-Type=simple
-# Disable extensions
-ExecStart=gsettings set org.gnome.shell disable-user-extensions true
-Restart=no

diff --git a/data/gnome-shell-wayland.service.in b/data/gnome-shell-wayland.service.in
deleted file mode 100644 (file)
index 100be7f..0000000
--- a/data/gnome-shell-wayland.service.in
+++ /dev/null
@@ -1,31 +0,0 @@
-[Unit]
-Description=GNOME Shell on Wayland
-# On wayland, force a session shutdown
-OnFailure=gnome-shell-disable-extensions.service gnome-session-shutdown.target
-OnFailureJobMode=replace-irreversibly
-CollectMode=inactive-or-failed
-RefuseManualStart=on
-RefuseManualStop=on
-
-After=gnome-session-manager.target
-
-Requisite=gnome-session-initialized.target
-PartOf=gnome-session-initialized.target
-Before=gnome-session-initialized.target
-
-# The units already conflict because they use the same BusName
-#Conflicts=gnome-shell-x11.service
-
-[Service]
-Type=notify
-ExecStart=@bindir@/gnome-shell
-
-# unset some environment variables that were set by the shell and won't work now that the shell is gone
-ExecStopPost=-systemctl --user unset-environment GNOME_SETUP_DISPLAY WAYLAND_DISPLAY DISPLAY XAUTHORITY
-
-# Exit code 1 means we are probably *not* dealing with an extension failure
-SuccessExitStatus=1
-# On wayland we cannot restart
-Restart=no
-# Kill any stubborn child processes after this long
-TimeoutStopSec=5

diff --git a/data/gnome-shell-wayland.target b/data/gnome-shell-wayland.target
deleted file mode 100644 (file)
index 37e1966..0000000
--- a/data/gnome-shell-wayland.target
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=GNOME Shell on Wayland
-DefaultDependencies=no
-
-Requisite=gnome-session-initialized.target
-PartOf=gnome-session-initialized.target
-Before=gnome-session-initialized.target
-
-Requires=gnome-shell-wayland.service
-After=gnome-shell-wayland.service

diff --git a/data/gnome-shell-x11.service.in b/data/gnome-shell-x11.service.in
deleted file mode 100644 (file)
index a10c33d..0000000
--- a/data/gnome-shell-x11.service.in
+++ /dev/null
@@ -1,33 +0,0 @@
-[Unit]
-Description=GNOME Shell on X11
-# On X11, try to show the GNOME Session Failed screen
-OnFailure=gnome-shell-disable-extensions.service gnome-session-failed.target
-OnFailureJobMode=replace
-CollectMode=inactive-or-failed
-RefuseManualStart=on
-RefuseManualStop=on
-
-After=gnome-session-manager.target
-
-Requisite=gnome-session-initialized.target
-PartOf=gnome-session-initialized.target
-Before=gnome-session-initialized.target
-
-# The units already conflict because they use the same BusName
-#Conflicts=gnome-shell-wayland.service
-
-# Limit startup frequency more than the default
-StartLimitIntervalSec=15s
-StartLimitBurst=3
-
-[Service]
-Type=notify
-ExecStart=@bindir@/gnome-shell
-# Exit code 1 means we are probably *not* dealing with an extension failure
-SuccessExitStatus=1
-# On X11 we want to restart on-success (Alt+F2 + r) and on-failure.
-Restart=always
-# Do not wait before restarting the shell
-RestartSec=0ms
-# Kill any stubborn child processes after this long
-TimeoutStopSec=5

diff --git a/data/gnome-shell-x11.target b/data/gnome-shell-x11.target
deleted file mode 100644 (file)
index f4af2c8..0000000
--- a/data/gnome-shell-x11.target
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=GNOME Shell on X11
-DefaultDependencies=no
-
-Requisite=gnome-session-initialized.target
-PartOf=gnome-session-initialized.target
-Before=gnome-session-initialized.target
-
-Requires=gnome-shell-x11.service
-After=gnome-shell-x11.service

diff --git a/data/meson.build b/data/meson.build
index 803e68289c3229139e16e50f7e3f9db5f5d328de..da9d704f75e106a60524fc606a87c4351b0ef404 100644 (file)
--- a/data/meson.build
+++ b/data/meson.build
@@ -101,22 +101,22 @@ if have_systemd
   unitconf.set('bindir', bindir)
 
   configure_file(
-    input: 'gnome-shell-x11.service.in',
-    output: 'gnome-shell-x11.service',
+    input: 'org.gnome.Shell-x11.service.in',
+    output: 'org.gnome.Shell-x11.service',
     configuration: unitconf,
     install_dir: systemduserunitdir
   )
 
   configure_file(
-    input: 'gnome-shell-wayland.service.in',
-    output: 'gnome-shell-wayland.service',
+    input: 'org.gnome.Shell-wayland.service.in',
+    output: 'org.gnome.Shell-wayland.service',
     configuration: unitconf,
     install_dir: systemduserunitdir
   )
 
-  units = files('gnome-shell-x11.target',
-                'gnome-shell-wayland.target',
-                'gnome-shell-disable-extensions.service')
+  units = files('org.gnome.Shell-x11.target',
+                'org.gnome.Shell-wayland.target',
+                'org.gnome.Shell-disable-extensions.service')
 
   install_data(units, install_dir: systemduserunitdir)
 endif

diff --git a/data/org.gnome.Shell-disable-extensions.service b/data/org.gnome.Shell-disable-extensions.service
new file mode 100644 (file)
index 0000000..de91167
--- /dev/null
+++ b/data/org.gnome.Shell-disable-extensions.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=Disable GNOME Shell extensions after failure
+# Note that this unit must not conflict with anything, and must
+# be able to run in parallel with the gnome-session-shutdown.target.
+DefaultDependencies=no
+
+# We want to disable extensions only if gnome-shell has flagged the extensions
+# to be a likely cause of trouble.
+ConditionPathExists=%t/gnome-shell-disable-extensions
+
+[Service]
+Type=simple
+# Disable extensions
+ExecStart=gsettings set org.gnome.shell disable-user-extensions true
+Restart=no

diff --git a/data/org.gnome.Shell-wayland.service.in b/data/org.gnome.Shell-wayland.service.in
new file mode 100644 (file)
index 0000000..ec79cd5
--- /dev/null
+++ b/data/org.gnome.Shell-wayland.service.in
@@ -0,0 +1,31 @@
+[Unit]
+Description=GNOME Shell on Wayland
+# On wayland, force a session shutdown
+OnFailure=org.gnome.Shell-disable-extensions.service gnome-session-shutdown.target
+OnFailureJobMode=replace-irreversibly
+CollectMode=inactive-or-failed
+RefuseManualStart=on
+RefuseManualStop=on
+
+After=gnome-session-manager.target
+
+Requisite=gnome-session-initialized.target
+PartOf=gnome-session-initialized.target
+Before=gnome-session-initialized.target
+
+# The units already conflict because they use the same BusName
+#Conflicts=gnome-shell-x11.service
+
+[Service]
+Type=notify
+ExecStart=@bindir@/gnome-shell
+
+# unset some environment variables that were set by the shell and won't work now that the shell is gone
+ExecStopPost=-systemctl --user unset-environment GNOME_SETUP_DISPLAY WAYLAND_DISPLAY DISPLAY XAUTHORITY
+
+# Exit code 1 means we are probably *not* dealing with an extension failure
+SuccessExitStatus=1
+# On wayland we cannot restart
+Restart=no
+# Kill any stubborn child processes after this long
+TimeoutStopSec=5

diff --git a/data/org.gnome.Shell-wayland.target b/data/org.gnome.Shell-wayland.target
new file mode 100644 (file)
index 0000000..2cb2c2e
--- /dev/null
+++ b/data/org.gnome.Shell-wayland.target
@@ -0,0 +1,10 @@
+[Unit]
+Description=GNOME Shell on Wayland
+DefaultDependencies=no
+
+Requisite=gnome-session-initialized.target
+PartOf=gnome-session-initialized.target
+Before=gnome-session-initialized.target
+
+Requires=org.gnome.Shell-wayland.service
+After=org.gnome.Shell-wayland.service

diff --git a/data/org.gnome.Shell-x11.service.in b/data/org.gnome.Shell-x11.service.in
new file mode 100644 (file)
index 0000000..5e85f48
--- /dev/null
+++ b/data/org.gnome.Shell-x11.service.in
@@ -0,0 +1,33 @@
+[Unit]
+Description=GNOME Shell on X11
+# On X11, try to show the GNOME Session Failed screen
+OnFailure=org.gnome.Shell-disable-extensions.service gnome-session-failed.target
+OnFailureJobMode=replace
+CollectMode=inactive-or-failed
+RefuseManualStart=on
+RefuseManualStop=on
+
+After=gnome-session-manager.target
+
+Requisite=gnome-session-initialized.target
+PartOf=gnome-session-initialized.target
+Before=gnome-session-initialized.target
+
+# The units already conflict because they use the same BusName
+#Conflicts=gnome-shell-wayland.service
+
+# Limit startup frequency more than the default
+StartLimitIntervalSec=15s
+StartLimitBurst=3
+
+[Service]
+Type=notify
+ExecStart=@bindir@/gnome-shell
+# Exit code 1 means we are probably *not* dealing with an extension failure
+SuccessExitStatus=1
+# On X11 we want to restart on-success (Alt+F2 + r) and on-failure.
+Restart=always
+# Do not wait before restarting the shell
+RestartSec=0ms
+# Kill any stubborn child processes after this long
+TimeoutStopSec=5

diff --git a/data/org.gnome.Shell-x11.target b/data/org.gnome.Shell-x11.target
new file mode 100644 (file)
index 0000000..02d6182
--- /dev/null
+++ b/data/org.gnome.Shell-x11.target
@@ -0,0 +1,10 @@
+[Unit]
+Description=GNOME Shell on X11
+DefaultDependencies=no
+
+Requisite=gnome-session-initialized.target
+PartOf=gnome-session-initialized.target
+Before=gnome-session-initialized.target
+
+Requires=org.gnome.Shell-x11.service
+After=org.gnome.Shell-x11.service